Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.05] floorp: 11.13.2 -> 11.16.0 #336155

Merged

Conversation

LeSuisse
Copy link
Contributor

Description of changes

Backports of:

Flagged as security related because it appears to bump from Firefox ESR 115.12.0 to 115.15.0
so it at least includes the fixes for https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/

Not tested, I do not have enough compute right now to handle a whole Firefox build :/

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

r-ryantm and others added 6 commits August 20, 2024 22:31
Release notes: https://blog.ablaze.one/4375/2024-06-00/
Git changelog: Floorp-Projects/Floorp@v11.13.3...v11.14.1

Signed-off-by: Christoph Heiss <[email protected]>
(cherry picked from commit 8fc8814)
Floorp hardcodes /usr/bin/floorp as binary path when generating .desktop
files for PWAs. That obviously not work for Nix-installed version, so
patch it to just refer to "floorp", relying on $PATH.

See also NixOS#314115.

Signed-off-by: Christoph Heiss <[email protected]>
(cherry picked from commit 116ee53)
Release notes: https://blog.ablaze.one/4397/2024-07-21/
Git changelog: Floorp-Projects/Floorp@v11.14.1...v11.15.0

Signed-off-by: Christoph Heiss <[email protected]>
(cherry picked from commit e12df25)
Fixing a regression introduced in commit e12df25

(cherry picked from commit 0b62c87)
Release notes: https://blog.ablaze.one/4415/2024-08-00/
Git changelog: Floorp-Projects/Floorp@v11.15.0...v11.16.0

Signed-off-by: Christoph Heiss <[email protected]>
(cherry picked from commit d5f5a05)
@LeSuisse LeSuisse added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Aug 20, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Aug 20, 2024
Copy link
Contributor

@christoph-heiss christoph-heiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for backporting! Apologise from my side also, will act (again) more strictly in the future on this!

Compiled & tested my usual things, everything looks fine to me.

Result of nixpkgs-review pr 336155 run on x86_64-linux 1

3 packages built:
  • floorp
  • floorp-unwrapped
  • floorp-unwrapped.debug

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 21, 2024
@marcusramberg marcusramberg merged commit 54b719d into NixOS:release-24.05 Aug 22, 2024
29 of 31 checks passed
@LeSuisse LeSuisse deleted the floorp-forgotten-backports branch August 22, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants